Merge "Camera2: Remove spurious warnings" into lmp-dev