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

Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
tree: 90c1349b2e2210b59953253c9768cc9b73d389f2
  1. core/
  2. services/