Merge "Fix a bug where CAPS_WORDS would not be returned."