Merge "Add service annotation for UUI"