Merge changes from trunk@1027413.

git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/java/branches/mrh@1027522 13f79535-47bb-0310-9956-ffa450edef68