Merge "Remove unused onResetDone." into honeycomb-LTE