Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I3f9209c52b692c09816e1ba82c722ea8d84d75ab