Addressing comments for CL 166499, commit 5073fedd. Change-Id: I359e5a4c026d58d75cb62b90c495796855302b94