am 541d9ccd: Reconcile with jb-release nakasi-factoryrom-release

* commit '541d9ccd4e0c177e29b4af35c1503330f94954bd':
  Avoid Resources$NotFoundException
  Fix a crash