Merge cherrypicks of [15981479, 15981480, 15981481] into sparse-7698606-L38200000952402237.

Change-Id: I2f75fc7924a3335a858b41f19c0413b0848de4cf