Merge cherrypicks of [1375213, 1375214, 1375215, 1374646] into sparse-6547930-L06700000650220878

Change-Id: Ia3e80a9b4015357ec2ec0760b2113f803bbafe8d