Minor improvement.

Change-Id: I92c7496214949bc5b04e6ad1a382cb8422641867