Bit of code cleanup (issue 11648206)

Change-Id: I2d04bbbdb037de089a16da236dadc4f5950504da
1 file changed