RC: Ribbon fix reset method derp.

Change-Id: I3d71e3851d53760f7d328aef1e564f0e0a537190
Merge "RC: Ribbon fix reset method derp." into jb-mr1
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1