[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 6611fedd1a  -s ours
am: c06aaeb792  -s ours

Change-Id: I9f56a7ec78b3d204232a4702440b9595c8aa4537