Merge cherrypicks of [9472539, 9472616, 9472853, 9472854] into sparse-5891648-L80400000371536426

Change-Id: Ie2bf91aea3f0a1da2558d675f6982fea2ddf6ca4