enrc2b: fix glitches

Change-Id: I159768f1fbc97b2b159261a80fee88a5d102547c
Merge "enrc2b: fix glitches" into cm-11.0