Merge cherrypicks of [10912720, 10912481, 10912578, 10909892, 10909942] into sparse-6345124-L92200000514115904

Change-Id: Icd731877c220b0e3b39258812030313cbaba90c0