am c9c3ed22: am 5d33de08: am bdac8cf1: Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""

* commit 'c9c3ed2299b9bfcbea032245080ed3250daa4acf':
  Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"