am 353a2c16: Merge "camera: Fix NPE in FOV test" into jb-mr2-dev

* commit '353a2c1661b2b7f4a83cab393d19df38e04870c5':
  camera: Fix NPE in FOV test