Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ieda43a5a0f94cd68ed2a7f8ed58ae2a36740fce8