[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 6bc2bfed -s ours am: 5aa40426 -s ours Change-Id: I10ffb2131c9d805a3071920dad17dbc0e22a7126
mentioned in commit fe5a72ca