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

Change-Id: Ief25ee6531839be0e3b659d70bbc1c7862e084fb