Reconcile with nakasi-factoryrom-release

Change-Id: Ieef3e00a660125acc348dd5c4392ffa4b6fba2c3