Some cleanup.

Change-Id: I47d867f3eaed55b53fdc26b463eef29994ecfd22
Merge branch 'cm-10.1' into martincz