Merge "Modify the Manual-selct UI according to Phase 3 UX review."
am: 6f04e01e24

Change-Id: I358d7bd17e5f2f62089acacba0946f689a30aa47