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

Change-Id: Ia2f80d8b4f8b8ebabff05be74a3acc1fd499c249