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

Change-Id: If40d1ac375832a2a9a713ec380991f84aedb92aa