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

* commit '84690f969e993ca712d028b9acfb0a7c17c08c44':
  Fix rild running in Nakasi.