Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ieab3bc4b27e5f8e98a32637df9b39222e8a610c7