Merge "camera case fail for testSceneModes"
am: b59cd66e93

Change-Id: I509c87e5b69e4bd26dc97e86063f7a24860e8b3b