Merge "Modify the Manual-selct UI according to Phase 3 UX review." into pi-dev
am: 35207e6363

Change-Id: I6ed2b39bdb402fdb629c24a737c53c01d712b3df