Cherry-pick changes to select module accurately

Change-Id: Iccda7a0ab817b4f496f3e22131ecfaf5e5c21f0f
Test: presubmit
Bug: 234305694
Merged-In: Ic807f5c9a0cd01ebae2b610a84bfa34d0833c167
1 file changed