Merge "Always use 'bool' instead of 'boolean' after '@param' and '@return'"