Bug 988118 - Gaia unit test failures on TBPL due to the camera merge
(cherry picked from commit 7c0d5d0c1047bd0edae92d685aef91d235a6143a)