Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I1f460af608d091f5e9fddcab2953817fee7eec43