Merge "Add DeadReferenceSafe annotation" am: 35353cb07f
am: 80acf74e3e

Change-Id: I02aadf76a280d9733acfe1bb63edf004f1bbcfda