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

Change-Id: Id5e500992f857b402784d52e84cc0d9cd6b41c92