Reconcile with jb-release nakasi-factoryrom-release

Change-Id: If959f96550e42768469ecd2f54ba60ba62140ca9