Merge changes from topic "ui-update"
am: e0dbd9f907

Change-Id: I64d1b1f257f265ba01b5fa4de9c7f228b6ed3e24