Merge "Shift call statistics back to the original caller." into qt-dev
am: 00412fe63c

Change-Id: Idaadf056bcc305116ac6cfd1110296e351617015