Bug 961029 - [Camera] Fix remaining broken ('skipped') unit tests
Merge pull request #15470 from wilsonpage/bug/961029

Bug 961029 - [Camera] Fix remaining broken ('skipped') unit tests