Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I390214bd97cf63ec6bbf211b281eeb34f53b4a5e