Merge "Fix/suppress tools google-explicit-constructor warnings" am: 18f469b088
am: 0d2565a424

Change-Id: Ibc500e408208821f3d59ecaba13552cd48a44f00