Merge "Api review: Notification.Builder" into nyc-dev