[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 92111e7392  -s ours
am: 86ec433acd  -s ours

Change-Id: Ifc2d8f0458888d52d29193ffaa6032480acdd83e