Merge "Avoid Resources$NotFoundException" into lmp-mr1-dev