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

Change-Id: I6279a0da6ebf1f5c6e78e0c43d4d0ce4dc9a566a