Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I21de3186d1a880575b7309675845e6b382c5882c