Merge "[Cherry pick merge conflict] Updating visibility of some members for easier extensibility" into tm-qpr-dev