repopick: changes to be able to pick from CM and LX

Change-Id: Ic7a550bbb0c24ba3fb5c8600443caa1a8376c101