Merge "Merge "Verify there are no more current calls" into qt-dev am: 1f12b5323a am: 4f1b208f66" into qt-r1-dev-plus-aosp