Merge "Fix incorrect public object access specifiers."