Merge cherrypicks of [18703046, 18703426, 18911632, 18919006, 19293127, 19294567] into sc-qpr3-release.

Change-Id: I9d1c23c5c9d13cc16c7a20583b4fd553c0def6f1