am f97105ea: Merge "Fix rild running in Nakasi." into jb-dev

* commit 'f97105ea898fd4ad83ca55e391c0d512e3497b9b':
  Fix rild running in Nakasi.