Merge "Camera: Re-enumarate new providers" into oc-dev
am: d1cdbf268a

Change-Id: I1dc221c5c01ba0b666c365fb13931c07aedee7c8