[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 92f6051190  -s ours
am: d9a4cce7db  -s ours

Change-Id: I31b9cad43d763bce3fbeb984d621f2e897d899ea