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

Change-Id: I244f7c87c8e997997a54c4f871fc6bfacc6a854f