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

Change-Id: Icbdce297d8c6d2289dd752e3f7a5c26bcfca697b