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

Change-Id: If5563eb16f3d64209fd715e75358332803251a10