Merge "Camera: fix new device register logic" into oc-dev
am: 4d351037a5

Change-Id: I7cf0574ccdcaf684319634ee5ee8c3b4d68557c2