Enable Custom Build Tag

Change-Id: I3a2c84712564522f9acd47af336a5448666e1a4a