This is just to remove duplicate variables from scripts. Change-Id: I26ea5b859ab3d494bd6432039d67683ee5632759