Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ibe87f908fb7665825284926900227a6f6428e153