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

Change-Id: I902dfde05540141a8150ddb260caa24882a7c1a7