NOTES: Remove a double word in comments
(cherry picked from commit efd0fdfe289cde91ee612efb083673036d8b01d4)