Merge \"Fix unsafe weak reference usage in test 141\"
am: a14893e4a9

Change-Id: Ie3a2f26c5bff817f0dd50e676a0fc9efbd972bdd