clean up the change a bit.

Change-Id: I1bbec407ef9cdd7061a3e43cd0e204ed68d4e7cc