4.21

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

Change-Id: I38056cedc23f38bc952b7475142d87bbb4d57354