Merge "Fix/suppress google-explicit-constructor warnings" am: aad7e1ccc5
am: 9a55c7aba6

Change-Id: I5042d7f5378a1192455a5086e68f9a76bea47a00