Merge "Clear mInterface before calling resetIkeState()" into rvc-dev