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

Change-Id: Ibeb87410278b43bd1f6fe3367359160680d6ac69