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

Change-Id: Ib79767caca896be7de916b6786eafdf7926b1569