Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I33a6822511a5d88f09aa91e6a3b2217862de216b