Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ic20f330e11467899ba95dab98586c24829c87a7f