Merge cherrypicks of [2264646] into sparse-9203117-L33000000956970619.

Change-Id: I905378e6833f27b32dc861185dc006e69ec54c32