Bug 550687 - Merge remote-tracking branch 'origin/BETA_JAVA13'

Change-Id: I7a54e1517e1cf4daa5c27eed30f2491277455a70