4.21

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

Change-Id: I741bbf3982dbf89d0f63e7dfbc1a165b15444947