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

Change-Id: I9c673fa124e4fbad2caabc53b8ea3636a81023b5