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

Change-Id: I88dd7e96c9734f8e6c1a9d746043cb0e216db609