Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ie2368fb992d54d2f97abc7de822b122cd8909941