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

Change-Id: Ib519c1efb9adb9e59d384672e0eacf09fcf24c63