Merge "Null pointer exception in FileRotator.java"