Merge "Do not run NotificationTest on Auto." into tm-dev