Minor code cleanup, addresses issues raised in issue 5097504

Change-Id: Ib409e96986b43d0c919256b6a2584ef515c93dae
1 file changed