Merge "API review: change to use getter to access a field"