Bug 933968 - [Camera] DCF Refactoring