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

Change-Id: I3d452e8151fec3c4ac8b8edb2b712d39ed876db4