Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I7c8a07aa1820a4a95030299c0d9c8fefbec98ea3