Merge "Fix/suppress google-explicit-constructor warnings" am: 14c95ecfeb
am: 6ff0b788ae

Change-Id: Ia006aad0168bea0dfd41cbda4ea4ce02b58b24fa