Merge remote-tracking branch 'origin/master' into BETA_JAVA15

Change-Id: I242f68f633e6af1620f1ff5f072075b95fd7b89e