Merge "Add RequiresDevice to relevant tests"