Decoupling frameworks (2/2)

Change-Id: I6f9c9caba79a76f47b862f7dcea7c90e0f4739ab