[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 7c1686fd08  -s ours
am: 2144adc3e7  -s ours

Change-Id: Ie40da70296ba3141baa408db46eb25fa4764e1f8