Merge "Remove AgingHelper code" into qt-dev
am: fbc908ab86

Change-Id: Icc89ed0bc1e6545f7c0c9fc4f352e8a795037ee1