Merge cherrypicks of [9540994, 9540080, 9540966, 9540888, 9540238, 9540889,...

Merge cherrypicks of [9540994, 9540080, 9540966, 9540888, 9540238, 9540889, 9540890, 9540891, 9540562, 9540996, 9540997, 9540998, 9540999, 9541000, 9540968, 9540969, 9540081, 9541003, 9539963, 9541104, 9541105, 9541144, 9541145, 9541146, 9541147, 9541148, 9541149, 9540970, 9541150, 9541152] into qt-qpr1-b-release

Change-Id: I873e9bdc2b99886e6879f5010993c9f8a1064679