Merge "Update expected call stack for caller of Thread.currentThread()" am: f50419ee am: 56c7532e am: dd8dd9b7 Change-Id: I9128122a98a1d3919fb7c6fd1e13dffef8ad7d8f