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

Change-Id: Id40f2898156e375b2e752657fbe6592d77b8a6e7