Merge "Move dump() to dumpAsync(), more oneway calls." am: 5773d9702e  -s ours
am: 5b9b0db9f8  -s ours

Change-Id: I085716f45435debc6418dd6bca9369cc2a17e1a4