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

Change-Id: I5851f2fadf0f34f85bc6f5d1053b6e78cd9e1a5c