Merge "Comment-only change to add documentation for FileObserver" into froyo