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

Change-Id: I5469e7716658926dee3208a32457a78beb62e84a