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