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

Change-Id: I1a7f00c3468a2ca53340790b6e6f3641bfa6ff8b