Part of normalizing it, note that the field must be nullable now and that will change later. Bug: T299418 Change-Id: Id543dfa20a153312f66d2f45a64ac23e7272dabe