Merge "Fix NPE when calling updateStateLw"