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

Change-Id: I40ef27be638d47c5359e93a24c12b2abcfc8c85f