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

Change-Id: If4a20eb83a34e658a8f70bec1d6dafd2ddc7c358