Merge cherrypicks of [2175002] into sparse-8904272-L47700000955792890.

Change-Id: I1f4fe242f9b539ff0b77f3174e984cf061147d23