Merge "DO NOT MERGE Disable the GamepadTestCase" into oc-dev