Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I498e07ca8d4fc3181054e386148b3b3ac41d59c9