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

Change-Id: Ic4ed1ac77f33f482b582f84a195d8b1ba76d7742