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

Change-Id: I8b1172c07bd44cc343054dd0047180c90109b772