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

Change-Id: I8edcf2fcaeef7523d2692cece541e632eaa6a5ad