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

Change-Id: Id829f21ad612f9220989b61ea787b82bdd307b32