Merge "Disable user-facing historical app ops methods"