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

Change-Id: I5a984068daa2d0347f0a4aef0d070bb3e9e80514