[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 34eb0ff8cc  -s ours
am: 2fb17eb0bf  -s ours

Change-Id: I174f5a17e9a1972a55295445b793e6d593d2b0d7