Merge "Revert "add classes to help RRO theme test""