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

Change-Id: I86a51b4433ca5336ae087e7813acfa7e29063793