Changed package selection

Change-Id: I22e41eff8928cce4d75095370b10fcbbb46b6ce8