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

Change-Id: Ic8072e6ba1b377f920ccf14f7ae4332c6909f07e