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

Change-Id: I1a4b6784554665b84936a66afcd4f5dae3789cbe