am e7c2a208: am 337fcbd4: am 55cd98a0: am 0f635b10: Merge "Fix method tracing from command-line"

* commit 'e7c2a208731ced1661bc02bccdec4889f19dd2cb':