[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 45d3998c43  -s ours
am: 7d47a345ed  -s ours

Change-Id: Ia79e41aecb82cf066a53cb45633f00673189793f