Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae
tree: 21fccb2f0b22b130e7b6d1ba27b5275e3bac2981
  1. core/
  2. services/