Merge "Allow fixup of apex directories."