Merge "Cherry-pick one upstream change" into tm-qpr-dev