Merge "Correct dump()" into qt-dev
am: 5ffba38d5c

Change-Id: Ieb74d1b269b6e0a3c0b510f4725dd3264970fa32