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

Change-Id: I34d92534a1d3f42ba1d58983e53f658b4ddc3593