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

Change-Id: I46f4cfc54d6d9b74ee54b03be67ea2c61a98e750