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

Change-Id: I3543e754c15d8d0bac74752214a612fecca8c893