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

Change-Id: Ic3edcc8d96ee47e0d6b3f4a587454ed68461cf23