Merge "Fix google-explicit-constructor warnings." am: ea7e4f7cbc
am: c3aa198a1d

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

Change-Id: I57c7856998a157bef4b2da37418618a00757c590