Merge "Verify there are no more current calls" into qt-dev am: 1f12b5323a am: 45fa5dacd9 am: d9465385c6
am: 2cd45e9581

Change-Id: I886b16e93721aaa4b02736d7ccbde9880a76945c