Merge "Ensure we have the correct thread when allocating obsolete methods."
am: 5442ff6bad

Change-Id: I985eac9946da95a0353fc222892bdee519ce3c5d