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

Change-Id: I259f346903e2ef2143b802911fb489807b8c9b8c