[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 77b4f77bf9  -s ours am: 5761d9a365  -s ours
am: 7887e78e41  -s ours

Change-Id: I41ca46506036364e7cf3aa2bae638d64d69b9f1f