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

Change-Id: Ie349ec1f062703d5a96d68aa73ac29b4cfbe5375