Merge "Fix a log issue in ui.cpp."
am: 7f38fbf976

Change-Id: I84dcdabf341eb566ee7591259c405ac7d406ebf0