Merge "Removing Ifdef declarations for RME tests"