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

* commit '8989290b5e7869ba419d72bd4daf6636dc450430':
  Always resolve enum when resolving resources.