Merge "Fix/suppress sensor google-explicit-constructor warnings" am: fbcaaeb1b8
am: c9265b50b7

Change-Id: I2b4d1f81cae79ca9e2b37f6cbbea175371e2d222