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

Change-Id: I8b19b73f8d542511f40708a7ecdec8801ced2e54