[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8ba86320a7  -s ours
am: 38c23ba314  -s ours

Change-Id: I56e61fbc1b86cc3cf5cd16c699987ef3f24a57e0