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

Change-Id: If9f36e1676204f79d62e9819afa0c2d26ad389d1