Merge "Ensure AoD transient messagesa are updated" into tm-qpr-dev