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

Change-Id: I455f274764b1044fd1816d0103e77165a99ff6e6