merge in nakasi-factoryrom-release history after reset to jb-dev