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

Change-Id: I3f279e1d1539db482c4e3a463cfa3b355eb88502