Merge "Attempt 2 for adding OWNERS for SNTP code"