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