Merge "Fix setFlags/addFlags typo"