am 2dcf912d: Merge "Make Camera V2 creation more robust agains failures." into ub-camera-glacier

* commit '2dcf912d17f2ed7197c783d1273ff6200709e6d3':
  Make Camera V2 creation more robust agains failures.