Merge cherrypicks of [9472848, 9472987, 9472988, 9472868, 9472869, 9472849, 9472850, 9472851] into sparse-5878874-L67400000371535416

Change-Id: I5d11571bc18eda339819d0a7ba907aa360c779f9