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

Change-Id: I0e0b1fbda8c91597774da1ba7a54dbecb9d0004f