Merge "Revert "Revert "Cherrypicking flags and override methods for all...""