[coastguard skipped] Merge sparse cherrypicks from...

[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L38600000960763138 into tm-qpr3-release.

COASTGUARD_SKIP: Ibf9a457338c6e9ba8c275de09a4c2196ccbc2f35
COASTGUARD_SKIP: I83429f9e63e51c615a6e3f03befb76bb5b8ea7fc
COASTGUARD_SKIP: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b
COASTGUARD_SKIP: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5
COASTGUARD_SKIP: Id53c6a2aa6da5933d488ca06a0bfc4ef89a4c343
COASTGUARD_SKIP: I848545f7aee202495c515f47a32871a2cb6ae707
COASTGUARD_SKIP: I169a1f72c84528ca606b6a4da165d4fbcd02b08d
COASTGUARD_SKIP: I7d3d35df0ec38945019f71755bed8797b7af4517
COASTGUARD_SKIP: Id302c41f63028bc6dd58ba686e23d73565de9675
COASTGUARD_SKIP: I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d
COASTGUARD_SKIP: I30579090c803b231fd750abbc4ad645805f7ece2
COASTGUARD_SKIP: I7a725647c001062d1a76a82b680a02e3e2edcb03
COASTGUARD_SKIP: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba

Change-Id: I041e2fb4e46cc789346e77912da5bed8d54b09c1