Fix UAA config template

Change-Id: I777280d908c7e5ccde6af9de597c0c18be0efab1
Merge "Fix UAA config template"