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

Change-Id: Id5555254bccb7b7ca14f5331341fdb33c86a7e55