Merge "Camera2: Minor logging updates." into jb-mr1-dev