Incorporated community code review feedback.

Change-Id: Ib84fffc3ef56519a7c64a40431804bd88eaa775d