Merge "Remove system status reset upon delete aiding data"