Merge "Remove paulduffin@ from OWNERS" am: e2a4d47ff2 am: 69989d1156
am: da077adb06

Change-Id: I0350bd4ef56746802cf8e643757c59afdd97ba48