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

Change-Id: I1cca86046fffdc50531f54817e1ab5e52dbfdfe6