[automerger skipped] Merge "Modify the Manual-selct UI according to Phase 3 UX review." am: 6f04e01e24
am: e385ee38bc  -s ours

Change-Id: I34d3fec9c3a35c3cbbb789b44a5f4ec1d589bd48