Minor code clean-up

Change-Id: I185b4b17c071ba1b9ed27ca8388b48670a343ec1
Merge "Minor code clean-up"