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

Change-Id: Ibf50d6bdc251efb9404f80eabfb1bdac6a289452