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

Change-Id: If9d573636dd11b7cff73a0e40749da47a6199ead