Update UX class annotations. Test: atest Bug: b/ Change-Id: If386abbdf3ac17e85473e78642c54dfb390a143e