Merge "Update expected call stack for caller of Thread.currentThread()" am: f50419eee7
am: 56c7532e7f

Change-Id: I463ba25d4c6387ad6eb34dfd9e53920c405e74ba