Merge "Fix NPE in constructor"