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

Change-Id: Ie65b3451ea7ed489d7621c3138a377ccb6abc30c