New master UID

Change-Id: Ie612fcbe1f171aac4ff5d738d5eb83814b80d9a2