am 3c505dae: am b3ff5477: am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev

* commit '3c505dae125b34483b9173401cb2fe84c86e2485':
  Camera2: Remove spurious warnings