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

Change-Id: Ib571aa0d5ff4d93332999fcfa75e1a4965f8a8a7