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

Change-Id: Ie3efd893f024ca041712bf065877a99aee6d9421