Merge "Per request in b/20081220, removing NOTICE file."