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

Change-Id: I4513871ae9e89c314bc5f275ff0f6af3c597987b