Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I8413b3bf0524dbfee9b1d5201774e2e519e56cf8