Merge cherrypicks of [2123575] into sparse-8719481-L11400000955098861.

Change-Id: I7898f53b41e072f7173c8ef96ac2123248cf9a74