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

Change-Id: I30b62371a32668af4eae9e20c75c1606f3148d38