Merge "Fix/suppress google-explicit-constructor warnings" am: dab0fc8229 am: e7cc7dd9ef
am: d5889c476d

Change-Id: I8143c4e04066440425e90f8b5e5451b3491d8c9b