Merge "Fix FlagOverrideSampleTest Bug: 141576561" into ub-launcher3-master