Merge "Always resolve enum when resolving resources." into lmp-dev