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

Change-Id: Id51e152b121193d19219ac5cc4be59be86e37fcd