Merge cherrypicks of [2039026] into sparse-8348651-L22300000953682111.

Change-Id: I5161a8c9a685f7c6dba0ce69964841b714f4f99f