Merge "Enable common logic for proto 1 and proto 2" into tm-qpr-dev