Merge "Renamed getter according to recent api review feedback."