Frameworks: ElectronBeam get some love (1/2)

Change-Id: I99486c19a378dcbabae0514ff2fe6f4828333275