Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I8c340688c8acf47fc0555b8136d2a1ab7cfbd24b