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

Change-Id: I029262474fdab29016eaf0dc009047cc5c899693