Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ibd5be536b10a8df19d365da267d2ad46b84dc14c