Code review updates.

Change-Id: I147c8bcc31c63d3983b48bd3dd30e2a6cb2f2840