Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I9310f85dee82643ae970456f5c8f3a7514211350