Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I79f1d759c0aaac8ca18ed91c49f554db44272fc9