am 5d0ba174: am 9a47c576: Merge "Avoid Resources" into lmp-mr1-dev

* commit '5d0ba1740023cfe63d4980b8c09521f080060cf5':
  Avoid Resources$NotFoundException