Merge "Remove old flags" into tm-qpr-dev