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

Change-Id: Iabb144c2750571585d280d1bbc3459e0239beefc