Merge "Clean cherry-pick 'Fix the auto-select UI.'"
am: f47348dc79

Change-Id: I432fa4023b436d83409fe5f32ffc180760049cb1