Merge cherrypicks of [2185476] into sparse-8939887-L62900000955926730.

Change-Id: I63187b0faebab9f37ee30f0ce9868099159d5939