Minor cleanup.

Change-Id: I45ee3fd5b2131131f3d10e05a1cc2f32a3e091cc
Merge "Minor cleanup."