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

Change-Id: I874e276fce4d8495f56d80ed449c0dc3fcf9c22f