Merge "Fix minor spelling and grammar errors in public JavaDoc"