Merge cherrypicks of [16018830, 16018969, 16018746, 16018698] into sparse-7743617-L36200000951473032 Change-Id: I097d489237429b6ac8aaaf6a41212529d565c7fb