Merge "Asset cleanup. DO NOT MERGE" into gingerbread