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

Change-Id: I21738369d70ff2933628c3bea335c0b6da5e3d56