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

Change-Id: I73c14123d65aaeb8724c34b272ab2b778e81bd11