Merge "Verify there are no more current calls" into qt-dev am: 1f12b5323a
am: 4f1b208f66

Change-Id: I914697c17f4d3336f96716ef197e54ba9f502b9a