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

Change-Id: I483473d7a65cde8269b2c4b75abe1a0c49ef1620