Merge "Revert "Initial camera device implementation""