Fixing merge issue with last CL.

Change-Id: I71444dafd11427e47387b0652664be21af0c5651
1 file changed