Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I42366ee22738eac90627669da9bb03ec8b598724