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

Change-Id: Ib9a127b0617f2ab2582d8c35d74f68d9b7c232f8