Merge "Fix method tracing tests on RI"
am: cbdcb6d505

Change-Id: Iaa4535d4f9420f38f43f775daacd2903840a67ef