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

Change-Id: I72cb6903c4e875527afe3abce7b54699de05c24f