Merge "Cleanup." am: 6ef0182f07 am: 770e87e315
am: 436e327a81

Change-Id: I9900feecb81d6c0348963fb7cfccd3af6d88bb8b