Label override

Change-Id: I3e47e1c53d26ea85151b85d9df553284accb4269