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

Change-Id: I624d90237eb4e4155e04c77ebe225b363f51181c