Merge "Add systrace tag for RRO"