Merge "Merge "Verify there are no more current calls" into qt-dev am:...
Merge "Merge "Verify there are no more current calls" into qt-dev am: 1f12b532 am: 4f1b208f" into qt-r1-dev-plus-aosp
am: acb530ed
Change-Id: I04eb680c333a8ed006f9a7452b4a4a819707cb90