Cleanup.

Change-Id: I4ee830f146529269be98d4b899a97e8e867fdb01
Merge "Cleanup." into cm-10.1