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

Change-Id: I6bff61435e7819379aa9d3507d8b742cdab0277a