Updated as a result of code review comments.

Change-Id: I8bdc7f5ea063985f4c4d29c512d6970d8fe33292