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

Change-Id: I5711f08e76d89d6f84a3dd0ae525d66e1ff2aa9b