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

Change-Id: Ie2dab583cbdfede93d8b441e6922607d60324b07