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

Change-Id: Iea1eea59b8faa5adea475588490d0fd956788ee2