Merge cherrypicks of [2183428] into sparse-8938890-L76300000955922175.

Change-Id: Ia4c3fe9339bede704d53b40eb68a89370993f438