Merge "Fix google-explicit-constructor warnings in camera." am: f9ee5183c8 am: beff1fb18b am: 019e54142c
am: 2f919a4951

Change-Id: I6b20f2f0e8c2153b11b8b1e54d92db290fb7bfab