Merge "Check value in dump before printing" into qt-dev
am: d8ec9971cb

Change-Id: I0cb6c1bec55e8490681e161100ef8522aebd91e3