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

Change-Id: I7d3092fb2520e1e0b348a73692d1a6865ac0a708