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

Change-Id: Id48300ec04692d040625176ce953e1f21e0bc6ae