Pull out picking from building

Change-Id: Ic067d157fd53c94062bcf2fa36f549151df87a1b