Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I2b5e77195eae1a9676c2530a9023290936e55255
tree: 0a9e09fa351cf11c8f9d41e8e9377df2797515be
  1. core/
  2. services/