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

Change-Id: I93670dc8167c3ceef07b89be39794d23b2401edb