Merge "Change android.testPatternData --> android.control.testPatternData"