Merge change Id46d9a48

* changes:
  Fixing 1 of the 4 BufferedReader test failures in bug 2224903.