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

Change-Id: Icedd28ef8734308638cd0d01e21d80fba765aeb9