Merge "Log correct reason for camera connect failures" am: b985e3c6ba am: 24048d59fb am: 7a1c05436e
am: 7e23b7150a

Change-Id: I4992ce1db1d01e1f36287ae988ca3105558f474c