[coastguard skipped] Merge sparse cherrypicks from sparse-13834683-L55700030014436762 into tm-platform-release.

COASTGUARD_SKIP: I7510c167e3f063ac48840bc9ccab66ab26d046ce
COASTGUARD_SKIP: I0f49ffa31dcabc07281ea4e10471cd3f3d1364ca
COASTGUARD_SKIP: Ib205f684efcf25171ee09e46e2833fa0758c9e7b

Change-Id: I3686966f915e4976cc44f05f4269f32af9e69c47