Merge "camera case fail for testSceneModes" am: b59cd66e93 am: a22c40839e
am: a494d7287f

Change-Id: I8e7c31b71e1ccfb77d5cb46949e438c2f1e1ef4c