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

Change-Id: I829e548b9d05c1d19f55774d497d90fa5f9ced35