Merge "Add checks to ensure SPIs are not reused" am: 0a1dd194aa
am: 1a2e3f3b54

Change-Id: I8c7243bc600e5f2e9abec03b5a357ed6376aa9bf