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

Change-Id: I7c2037bf0ae0465f3b4e4fc646109cd4282ec365