Merge "Dx: use context out/err everywhere." am: e67321b84f
am: 5a75e2d18d

Change-Id: I235d4444d551061f520c2d6dca5e1ba5353160a8