[coastguard skipped] Merge sparse cherrypicks from sparse-9683873-L11000000958978269 into tm-d2-release.

COASTGUARD_SKIP: I7d177e1ad437b08f4257dd675fc8fc9deb227d3f
COASTGUARD_SKIP: I9c34ec24d651479cd06100f697e91189d58ed15f

Change-Id: I2d0abc33b85024ce085171e501b692c556c51791