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

Change-Id: I7c3afdccda0b6105f8ef740ea0dc95528fdae91d