Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I60b68feb036d2d484b705490d68113c856a611b9