[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: f844e0d526  -s ours
am: 85306364e7  -s ours

Change-Id: Ied2e7833bdfcb164312e8565b12794fa4eff248a