Decoupling frameworks (1/2)

Change-Id: I04d002ea722c08960ec0afc81f4167e3be9c9b50

Decoupling frameworks (1/2)

Change-Id: I890ed40bfd7da3430ad1140a453502bd662ff056

Decoupling frameworks (1/2)

Change-Id: Ia26b95e8890c53326c3ac77db86e26c9c23aa510