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

Change-Id: I18db8023d36fb1b0e18e6bd66d470dc1c3f3bb01