Merge "Moved all flags constants to FlagsConstants." into udc-mainline-prod