[coastguard skipped] Merge sparse cherrypicks from sparse-9486377-L84200000958167518 into tm-d4-release.

COASTGUARD_SKIP: I3461c9e33b64e7d44bb3b430c8eb00d794669037
COASTGUARD_SKIP: I7089cc33b168cd254505760148badd1079061c4a

Change-Id: I77e03555ccbcffc1e76c35ecdcf7bc160ece9885