Fixes: 159529327 Test: run robotest and observe the UI Change-Id: I60f4a341b427e4b619a202a440f3f2554c562a27