Merge cherrypicks of [16373492] into sparse-7796139-L39500000952224718.

Change-Id: I8b4e5cdcabba3b2e6b79a084e7d49b25f0ee1277