2e6de8fdcc
also delete some obsolete back-compat tips for <=donut bug: 8746126 Change-Id: I3ee966647aa2c9f572e6f02eeabfc2cf925a031f