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

Change-Id: I72ff4ac519a67613e4fb2cab3130013c203e13ea