[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 9c7e15dfb8  -s ours
am: dc54499a84  -s ours

Change-Id: Ife8e6ca7b61d14166ca18195513e23bc75edec7c