am 8bb57472: am 2552036a: Merge "Camera2: Configure ZSL at the right time." into jb-mr1-dev

* commit '8bb574725ea880c53986c8d66eeb090731ecd6d5':
  Camera2: Configure ZSL at the right time.