Begin updating ui.xml

Change-Id: I501c5c6821cd738fe0b4fb84d5506fd79618a484