Merge "add xml attributes to IME javadoc" into klp-dev