Bug 577731 - Merge remote-tracking branch 'origin/master' into BETA_JAVA18

Change-Id: I79d9d8a2ca4f6bbb4923a6d766c343c3cceb7a88