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

Change-Id: Ic94a1cba03952f0d720fc8a7d3892b88e0f3cf69