Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ibfbde4f9437502df4a7580943f99ad13e427bdd5