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

Change-Id: Ibb3518bd0c5f03499e61326b33d321379a13e4a1