[coastguard skipped] Merge sparse cherrypicks from sparse-12647699-L15800030007891938 into tm-platform-release.

COASTGUARD_SKIP: Ia1d3119d3a7c566cd2e3af869036706fc2404c44
COASTGUARD_SKIP: I951d7783f5c425c03768efb7aee7a38e299e6536

Change-Id: I9e871734d6ce317636a85dcc3b6cc2643eb35d50