Handle methods being present in multiple threads correctly
am: e7a33545a6

Change-Id: I93cf33fcdcd48b40a226630ffdaef5ac8aa90b68