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

Change-Id: Ifd127d824103cd7cf94b212c166471d07ff2126f