Merge "Fix javadoc typo in ApplicationInfo"