Clean up

Change-Id: I82b56654cedd1455267006063269fb4e034fa0a2
Merge "Clean up"