Reconcile with jb-release nakasi-factoryrom-release

Change-Id: If473fc45ebf7c4abb91113d12ae559be93c8ecdf