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

Change-Id: Ia0e6ac059f82d2466a972f1ce250452a51cb6a83