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

Change-Id: I41530ce9be81551952a8608330bc23332d56e687