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

Change-Id: Ic1b2209b2dbefa34dd3dd9dc423b542817c67ba1