[coastguard skipped] Merge sparse cherrypicks from sparse-10385117-L18800000961818182 into tm-qpr3-release.

COASTGUARD_SKIP: I92e594aa6ee09313155c55e6470e55916921eda9

Change-Id: I67ba9fbf93d81a306026cd115a6c9fe1706fd331