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

Change-Id: I63a7adcc621ba8c4a4a2ea90e3e6b208f1d735c7