Upate to use 'link' version as per mocks, and align right. Change-Id: I1955ca3f715f1eea495dde8987d99defab485fbc