[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 1f77118526  -s ours

Change-Id: I6c93ddf58bb115d49fdf618409830546177e727d