Update to the new contract class location.

Change-Id: I3ebf5a9dbac4b3b6ecbc0468242dedf909c23882
6 files changed