Cleanup a few APIs in mock agent

Change-Id: I3d7c96ffc1ad5ab8a6567b96bbf383e76a8c62b7