Merge "Add DeadReferenceSafe annotation"