Add RDS support to UAA

Change-Id: I72bba914b7b1677b0815e3338ce2a1a54678bc54