Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ib33447b73ea4b57a4eafa201c74879ecd31ae1a8