Fix suggestions in gerrit review.

Change-Id: I522afff5384ad7c816e752c86a13393235035bde