Merge "Follow-up I0bb4ed7f7: Use correct 'this'"