Merge "Remove failing NotificationCompat tests." into nyc-mr1-dev