Update the UAA to 1.4.6.
Update the UAA to 1.4.6 per pr/194.

Resolve conflicts in merge.