Merge changes I5ad71fb0,I0756816a

* changes:
  Move SpaEnvironmentForTest for tests.testutils
  Move EntryHighlight to framework/util