and modify some UI part jira: none Change-Id: I9462a10adb7017a7038e5cd7e30cf393b63ae77b (cherry picked from commit da68a52247c3a963b9d5df339da8f80ead617839)
and modify some UI part jira: none Change-Id: I9462a10adb7017a7038e5cd7e30cf393b63ae77b (cherry picked from commit da68a52247c3a963b9d5df339da8f80ead617839)