Bug 573521  - Merge remote-tracking branch 'origin/master' into BETA_JAVA17

Change-Id: Ieaf05de3b9295ccf28011824319776e0d141e036