Merge "Camera: Fix hotplug"
am: d7a0f2984d

Change-Id: I4080b7ac5ae3999702e346224e9392c548015a4c