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

Change-Id: I0f088fd4ef78b0fff06b656c8f4f884bf6129080