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

Change-Id: Ifbec80be45599adbff64c5be25241bf6999d60f8