am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev

* commit '7b13c4d8ecc517ae64cc5bd14c40eaef29e8281c':
  Always resolve enum when resolving resources.