Merge cherrypicks of [17777241, 17777140, 18119099, 18030840] into sc-qpr3-release.

Change-Id: Icfb5e76ad620dee1ffea5e71a1de605c9176d709