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

COASTGUARD_SKIP: I4ccf22f85b4ae0325e9f8e29503149bbda533e86
COASTGUARD_SKIP: I9ebfa955cc109881dc2605bc2e90d6e03f58c0bf

Change-Id: Ic62f312b04d67dc8375bfbde89e2f81adfd1e073