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

Change-Id: Ib809d4fce71c9ea0558a48766237e1422c093bec