Clean up tree for release branch

Change-Id: I82e4967eda33b5ab37af505619ffdd1733796e69