Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ica7c000a9aa45215dbefec538d8221d9d8134236