Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ica8aa2dd8cbd2b5ac3dcdd4dc1f277394076f75f