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

Change-Id: I8333a3c0e3f804bd76acc9971335e4e1dc307612