resources: Merge branch release-staging-v21-2 into stable

Change-Id: I352905b9845ea89d9697910cb778515115b133e6