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

* commit 'a76823b50c01d37b23b15ee3c6f9f17e94d354ac':
  camera: Fix NPE in FOV test