Reconcile with nakasi-factoryrom-release

Change-Id: Ib47a2f4001bbf5ec4a2b889a16e41a1259eb6e1a