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

Change-Id: If0ee224d00681adeed33958360d5249b632ce962