Updating to work with atomix-runtime

Change-Id: I5a6e861cf8e14c8374c3f07d3db8e85d98e27eef
7 files changed