Remove duplicate definitions of utility variables
am: 28d2c2ff10

Change-Id: I34db2ef013e7030088dc1b8592943b5a4ed15c51