Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I47aa2582e6f4dc8c82eda09b8c2fbce390ca1222