Merge cherrypicks of [19716374, 19716774] into sparse-8927612-L71600000956100018.

Change-Id: I33161f24d5086e24613ed07018d4f13af3b261c5