Merge "Fix bugs with strong versus weak reference paths."
am: dc02d53eee

Change-Id: I3ae6f57f38cd2af67f49a56eb5c8334c59034c94