Fix and enable gating on F841

F841 local variable is assigned to but never used

Change-Id: I4b54489386deb655821192b4ec1e9c0ea596a9b7
Merge "Fix and enable gating on F841"