Merge "Amend tests on GSI that rely on RKP-only props" into main