Fix variable access deprecation warning

Change-Id: I9f833144650cfc60b6956470032db30d311ff6a3