am d83d4c86: Merge "Fix stack trace for proxy methods and added test case."

* commit 'd83d4c86c89357a74e94963994ad0c42ea7299c3':
  Fix stack trace for proxy methods and added test case.