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

Change-Id: Iafe81a0d1d0cc0fc56225eada537cc90a8b8f2a2