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

Change-Id: I0f9cc76da1a2b51394920140693ba52ea4ca7e7a