Merge "Remove @hide from IN_DEFAULT_DIRECTORY"