Merge "Include all flags in our flag list." into tm-qpr-dev