Changes after pair code review.

Change-Id: Ib72d40f8e9027818cfbbd32a7a7201eebda07455