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

Change-Id: I5fd12dc7ffdfc72da9dd1de7f67e23e7e05136df