Merge "Fix google-explicit-constructor warnings in camera." am: f9ee5183c8
am: beff1fb18b

Change-Id: I0f337390c99af8b300b28f8dfe60635290fc20b0