Merge cherrypicks of [15920193] into sparse-7767458-L42400000951322649

Change-Id: I923be9c2851f7b0bc577fd96ea40eeb5743e5b85