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

Change-Id: I4281b7fe104fe4f1c0f73b65593608c43e0e1580