Merge "Update expected call stack for caller of Thread.currentThread()"