Merge "Fix/suppress tools google-explicit-constructor warnings"
am: 18f469b088

Change-Id: Ib4632dfb6149108d7eb77c05d9f97258123b3493