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

Change-Id: I895dc0e8fd07baa2fee6341e32bafab4f5cfd0d7