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

Change-Id: I893925014557e5ae13303debc4ee8f50faf9605d