Fix according to review.

Change-Id: I6ccb2cb9963369b5998502b7b63c636cfd0334d2