Merge "Camera3: Improve error logging" into jb-mr2-dev