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

Change-Id: Id4c4a30174451e8a0922f0c75165561773a6fe35