[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 501be370 -s ours am: 1cba242c -s ours Change-Id: If84e8aa7d5fc9cbd7ff85fa8aa2204a47b439a58
mentioned in commit 2e68f736