[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: f01fb825c7  -s ours
am: 18e8d03f31  -s ours

Change-Id: I9deda55328659d2011e67bccafcc6e1f831fc335