Fix code review comments

Addresses code review comments on I6e25b77e73ca7b7b6869c283e2496bfa14242248

Change-Id: I8420221cc95e33d0b0b6f070814c1cf92cbb667a
1 file changed