Clean up. Bug: 27420435 (cherry picked from commit f8484c8b) Change-Id: Ia20781ee36e6a31c88ca41d3866b26813cff434d