Merge "Add checks to ensure SPIs are not reused" am: e9f609ee76
am: 567ecd6790

Change-Id: I8c7243bc600e5f2e9abec03b5a357ed6376aa9bf
tree: 59e3ba598b840487833a37e8b434afaef13e7970
  1. core/
  2. services/
  3. tests/