Merge "Revert "Inlining synthetic accessors.""