Merge "Ensure the GC visits Obsolete Methods" am: 9e2a1cadf7 am: 7d04272162
am: 88f24f38dd

Change-Id: I3228c54088767ab6a10abeef8ec96b3bb0173b06