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

Change-Id: I80ed16ea23c62906aacb858a377450b33a7aab4f