Merge "Skip Route tests that are R-specific on Q" into rvc-dev am: 28aa900400

Change-Id: I4622f004372a579ac5d51150a6b45a22942a794d