Remove duplicate definitions of utility variables
am: 4010f14244

Change-Id: I8dc63c6b8f9bce73ae7645411a7b505020cc643e