Merge "Selectively allow dead reference elimination"
am: b8f88f33b5

Change-Id: I1b2f9797880b04b2fa0a5d364ae2c0ba4876b210