Merge "Fix "check" file, and mark test as failing on device."