Merge "No code changes, this cl only reorganizes the functions" into tm-qpr-dev