Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I17f88425d34e570293c17fb39d92f363e982c002