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

Change-Id: Icb2856acb9c136609ef2843ea82a533e6cd1c8e8