Merge cherrypicks of [2183420] into sparse-8935784-L20500000955889404.

Change-Id: I5bf0c412ab8d3938967beb7bfae6f2746e01cdbb