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

* commit '6526c6883bd55ccd664fc3d4bb5874f2e9dde2f7':
  Avoid Resources$NotFoundException