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

Change-Id: I59533137ee7939fecd9aa977df7d0eb59b2616f4