Merge "Add VSR annotations for RKP DICE"