Merge "Move dump() to dumpAsync(), more oneway calls." am: fedf0503be am: 00334135d2  -s ours
am: 12f53d6b5b  -s ours

Change-Id: Iab5af99a29ecb118e1717b3dae7ed6b4bb9d320d