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

Change-Id: Ifb938f704fad3f25822265c7cf6a13c8bcac3226