Merge "Two test cases require SDK 17+, marking them as such."