Fix UI to mocks

Bug: 16034329
Change-Id: I6746baeee3f49ad1df2524d690c870f49afedb48
9 files changed