Merge "Check for both proto flags for common logic" into tm-qpr-dev