Merge "Fix google-explicit-constructor warnings." am: b1304be
am: c4515b5

* commit 'c4515b505123815839f0ee672741e82423aa72e6':
  Fix google-explicit-constructor warnings.

Change-Id: I39d53b09a735a6e0604ce153e4f6e8f4257473ce