Merge "Fix implicit conversion to bool" am: 95d03db971 am: 5c51a0e9ab