Specified all needed subpackages

Change-Id: Ia4ba36a4ff27d2529999784654066252a1f4c89f