(Bug #44961) get rid of "Patch Set" in comments

Change-Id: Ic261fb4458bff5344e583ea3ddc368ee46c24a8e
Merge "(Bug #44961) get rid of "Patch Set" in comments" into production