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

Change-Id: I4eb2007042b9e917aa3d706e9ce5b1e60bf2ae16