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

Change-Id: I4eafcc756e145df6e5b5ea9a526462fcb50d2333