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

Change-Id: I92a45cb99260c68bd21e226f81b648a20c7dbfc5