Replace direct member access with getter that checks for nullness. Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586 (cherry picked from commit d758e042ce08c46712db3db2d63fc84795028dfe)
Replace direct member access with getter that checks for nullness. Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586 (cherry picked from commit d758e042ce08c46712db3db2d63fc84795028dfe)