Hacks for running with marathon

Change-Id: I3c3da8400480cb21dd54e2b7e9151af83924b086