Infrastructure improvements

Change-Id: I3e017cc4105ccfb7af19ad1debdf16151a3822f0