Merge commit 'fef8cebc' into froyo-plus-aosp * commit 'fef8cebc': Clean up SearchableInfo API, JavaDoc and formatting