Merge "Fix NPE in user builds"