Moving assembly and plan creation and deletion to base client

Closes-Bug: 1361832
Change-Id: Ic325cc5bd34a536c051ff25d04b2b0c2ebb84a4c
Merge "Moving assembly and plan creation and deletion to base client"