Merge "Add ApiSetNotificationTimestampIntegrationTest"