A bit of code cleanup (issue 11026590)

Change-Id: I8b2ef52f59abdbe3ca286eac6e639f19a11f7970
2 files changed