Merge cherrypicks of [16035980, 16035891, 16035981, 16035776, 16035777] into sparse-7805805-L49600000951508926

Change-Id: I04b62a034fc0529226ae3af95fb37e622749cf13