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

Change-Id: I470b3989bdafc6e8a27255e615acdb7608401ad3