Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I2b5e77195eae1a9676c2530a9023290936e55255
tree: 688bc394884c3eb080a3592285c971ff5c578e53
  1. core/
  2. services/
  3. wifi/