Minor cleanup.

Change-Id: I628592be7ec5139ad95230f4936cb4c5a423429d