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

Change-Id: Ifc5d45652400be5daae071e3b27ab35cb8b75670