Merge "Remove fastInvalidate and setFast* methods"