Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev