[coastguard skipped] Merge sparse cherrypicks from sparse-9738651-L51000000959186185 into tm-qpr2-b-release. COASTGUARD_SKIP: I52185f74ae8d28b379440235ca6f03c5089081f5 COASTGUARD_SKIP: I509cceb41f56ca117d9475f6f6674244560fe582 COASTGUARD_SKIP: I5adaf7441a81ed9ae961133da59d912d807ff21b COASTGUARD_SKIP: I0e255c64243c38876fb657cbf942fc1613363216 Change-Id: I6e89fc36dced570e36219aa323a3598dec0bd3b8