Merge "Cleanup." into cm-10.1

Change-Id: Ide3d65bd990db4c2e963fd82de9fe344385e9508