Replace direct member access with getter that checks for nullness. Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586
6c1af7ea
8652bce1
c71f2648
815d9bb1