Merge cherrypicks of [9498126, 9498166, 9498147, 9498167] into sparse-5916148-L86100000373241811

Change-Id: Ie7896037d595b46cae1c24046f71d6818b6edc5d