Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I1e1e925225a01365127f5316827d8c4ca2e34fa4