Merge "Fix: NPE in unit test."