Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Idcd615270e5572f17209cc2f91396c38144a0915