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

Change-Id: Ic45d757615da575fa74e838bd9644da95a5ddf4b