Merge "Move some LocalFile comments around"