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

Change-Id: I8a6aeac459a955e6c96cf40b0c01bdbb0ee4de3b