Merge "Merge "Fix/suppress tools google-explicit-constructor warnings" am: 18f469b0 am: 0d2565a4 am: c7aeafd2"