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

Change-Id: I1c0cedb7ab51d52639be6556b6c7546040c88d1b