Merge "Camera: Fix hotplug" am: d7a0f2984d
am: 78d88380d3

Change-Id: I1900d086672c7541e1100321563079c675a5d55d