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

Change-Id: Icbb10b093e7a65bf0ccf0573988803e07c6b8ad8