Minor code cleanup

Change-Id: Id9758c56795f1cedf3b89b86b0a66c0ac84ebdb8
2 files changed