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

Change-Id: I380d87e4e1fa8cae9efd3ac10656e7b4e4cc7bfd