Merge "Add DeadReferenceSafe annotation"
am: 35353cb07f

Change-Id: I727fffdb3ccf7665cd270989b12783d95d3613d0