Remove duplicate definitions of utility variables am: 4010f14244 am: 446004df9b Change-Id: I9c84cc08b2d26014afdd570a0182907577bf430f