Merge "Remove usage of optimized reflection getters"