Frameworks: Disable at first boot and code fixes
Change-Id: I91b2384916718448e943f3ea7f9490bcdf87be72