Merge cherrypicks of [15951009] into mainline-art-release.

Change-Id: Ic66655cec5962bf00bcbde2b6874c3cf7d889181