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

Change-Id: I057690792eeffd320c60f1bcd7457bf0ad3453fc