Merge "Fix/suppress startop google-explicit-constructor warnings"
am: 667dba5c14

Change-Id: I1dd95d363eee3fa58752efec4d895b7990c4cba0