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