Simplify asynchronous messages context

Change-Id: I4ef7dfb77e0046d3778ca2fd6fbc702c0851b030