Fix for previous change.

Change-Id: I83ce75d65151dcbd5fc1a63c0e1c146c4be064c4