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

Change-Id: I0e89789a045875c682a7db77845eec70c99b6664