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

Change-Id: I269cd839c92b6703853c3a81ee525990a2d7901e