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