Merge cherrypicks of [16873141, 16765537, 16713864, 16678490, 17089346, 17112345, 17155535, 17046148, 17183360, 17343385, 17408864, 17071224, 17592146, 16405924, 17567140, 16908080, 17147924] into sc-d2-release.

Change-Id: If7a5395ea18993acf6af4fb61dfaf28870d7e510