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

Change-Id: I1278af9e5244995c7fdbc4ee7a54314571b3df3f