Minor code cleanups.

Change-Id: Ib3729cf38b107b7f2186ccf410a745e0472e3630
Merge "Minor code cleanups."