Merge "Add missing SHARED_LOCKS_REQUIRED attibute."