Merge "fixed sonar issue in NetworkRollback.java"