[coastguard skipped] Merge sparse cherrypicks from sparse-9292298-L16600000957892016 into tm-qpr1-release.

Change-Id: Ief45ac21be0095a55fd26996d5cb8d3ff2bf00de