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

Change-Id: I869fd77d4f8b4ecd7c76c2bf6b5256ddd60a3e0c