Merge "Camera: fix various depth camera failures" into pie-cts-dev
am: 37a878be84

Change-Id: I31c6ae53d332abfba04ecf6b56021e6f5365dcfb