[coastguard skipped] Merge sparse cherrypicks from sparse-9629236-L10700000958690373 into tm-d4-release.

COASTGUARD_SKIP: I559d4646cf5d8540558e4fbc74f8be8ed0911bfc
COASTGUARD_SKIP: Id14c6726c1ad4f5dc820cde192082b8eccd11e25
COASTGUARD_SKIP: I305dbc8dabb86578e379c1dea87645614b74c0bf

Change-Id: Ie6147788f67a097b0e902def7b39e1b3cbe6dbae