Updates category to use RAP 2.2M3 features
Merge "Updates category to use RAP 2.2M3 features"