Merge "Ignore OneTouchPlayTest"