Move spanned utility class only needed for tests
am: 54b53a5740

Change-Id: I6d050aeb5618528f1db4ded84e0a7096fbdd4411