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

Change-Id: Idbf577a6d169abc1210dd51d1ed171a15c4ec116