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

Change-Id: I89e36d521fb3c4578d8b49711a6829cfe2e27f09