[coastguard skipped] Merge sparse cherrypicks from sparse-9402666-L12400000958024923 into tm-qpr1-release.

COASTGUARD_SKIP: I4f87a92fe40e6c251549c7a1a0d0326dcd7a2d08
COASTGUARD_SKIP: I07bb92a352b6f7f35dadd3d39249490298815dc4
COASTGUARD_SKIP: Ieb6f995d6a202cd0746fa25dec4f9b63c4eefe6a

Change-Id: If8181d61c3972b6253410da9f3d8e94c20d49c1b