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

Change-Id: I0efecc008ff21584fbec19fd68b2a94368821b4f