Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I1c097ce113edfc5de25039b70439131d9c0dcdeb