Merge "Explicitly enable relevant flags for all on/off flag testing." into tm-mainline-prod