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

Change-Id: Iddd0c6592c93f6b3b5cc058971bc3bf95912f89a