[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L87300000959339500 into tm-qpr2-release.

COASTGUARD_SKIP: I73a244a6fe3306330fb53595f21b50245f051e32
COASTGUARD_SKIP: I6d5ba8a4ec8c3e5a26b9af3e1035479ebf94b94f

Change-Id: I95771e2671cb6fc043ef85a316955c78d743b4cc