Merge "Fill UI polish" into oc-dev am: c9a83326c2
am: 400f10fe50

Change-Id: Iabc6c0673960d8fee59d78e549ea04826064c37e