Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I5223737e6ad30352b2328d5bf42c347f2fdc5e17