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

Change-Id: I9854cf4f7a3053fb9f1efc9b714be5dcfd557bf4