Merge "Fix/suppress google-explicit-constructor warnings"
am: c4f5492a93

Change-Id: I83d4cd5f62103b74f3dcf007b80fd8162e4727f7