am 6cc5d7fc: Merge "fix broken user build: do not throw an error when in user...
am 6cc5d7fc: Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev
* commit '6cc5d7fc':
fix broken user build: do not throw an error when in user flavor.