670cc23373
While here, clean up the port and remove @dirrm* lines PR: 194363 Submitted by: Christopher Hall
While here, clean up the port and remove @dirrm* lines PR: 194363 Submitted by: Christopher Hall