Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I35babf45d3dff40fa4b98150a7b76937a23b8f52