ART: Make some variables references
am: 4c481a4245

Change-Id: I18db9f55de111ba7e61f768008e215159b853ac3