Merge "Fix/suppress google-explicit-constructor warnings" am: cd6fc8c1dd
am: 4754484fc8

Change-Id: I45e1ca446d64ac09750fad7badb785cc0024fb91