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

Change-Id: I1ed8d64f56185eec7af0acdaf55912beb331f400