am 754cbdd2: am dca0ac21: Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev

* commit '754cbdd2dd3376bb2b55d762c2909f816bd768cc':
  Camera2: Fix uninitialized parameters.