Merge "Disable R+ tests on Q"