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