[coastguard skipped] Merge sparse cherrypicks from...

[coastguard skipped] Merge sparse cherrypicks from sparse-10216780-L32300000960937408 into tm-qpr3-release.

COASTGUARD_SKIP: I98618477a828eb72b2173af6988e804471139e81
COASTGUARD_SKIP: Ieea33d3005d3bfa29c5287899a6299f6ed666a36
COASTGUARD_SKIP: Ib4eef40a0f59512c669b069532e55d36293f9e1c
COASTGUARD_SKIP: Ib3240c0b5037a3a20692c83e2daa8cd858125ca7
COASTGUARD_SKIP: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73
COASTGUARD_SKIP: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801
COASTGUARD_SKIP: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46
COASTGUARD_SKIP: I62e829555c43136080ee4909f7dcf8c388165e9f
COASTGUARD_SKIP: Ie12843d00c5336e5a472624205e4e4b9ec881cc5
COASTGUARD_SKIP: Ic7b1c4b40960fd04de9efbf4f6d7abee45c93025
COASTGUARD_SKIP: Ibd6d9a8377e4b5327a473f8b9adf4e569e826172
COASTGUARD_SKIP: I7bc69ddf1c1742bd800eea4068ce268dfd96d0e3

Change-Id: I685339b878e457a75c45e34890149dfd47f218db