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

Change-Id: Ic42cbd3cb4ca7a222114d04dce31564cbe7ac2e1