Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I93afcbdd823160a61e539f73e52753f2ebadcadf