Electron Beam Fix

Change-Id: I6caf0f4d74ec6b439ae9e9ac88f2c215a905cc62
Merge "Electron Beam Fix" into cm-10.2