Merge cherrypicks of [11358637, 11357965, 11355583] into sparse-6436923-L65000000546543974

Change-Id: I721a0700c7557a8ffdc9a565d907d27bd651a8ac