Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Idc407af8f1c35eec3901797e62283f15b5ca147a