Merge "Remove unused variable: mMyThreadId" am: 3acb0cbb64 am: 475869c973
am: 339a799afe

Change-Id: Ief8003f0a202e5fdb9d81dc86b6e4fcc2abb6c5f