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

Change-Id: Ia20a040edc46fbd6d3df3c788f3d566fa30840d9