Merge "Fix reference counting for Assembly" am: 3b6530507b am: 53bfab1f6d am: 9bbcc891d7
am: 9bc1ea9666

Change-Id: Ie2f7e5c9b8433a8ab9ad87740266942e6f87ff2f