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

Change-Id: I13738ac37710ec7934998ef269681ae7c41c612e