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

Change-Id: I41115ea42291a608417f25b6ea63fe3fddbeb5d7