Merge "Fix longstanding bug around implicit NPEs and GC, version 2."
am: 75eec5d140

Change-Id: I170dc22af210f38e9103be85bfc921682c874bf5