Merge "Remove a TODO associate with starting a thread" am: c685e1e4a1 am: d61516d7b5 am: 70267e2d45
am: 4a5505008f

Change-Id: I6e5dd67d93156e7670dd30c52fd37b48e5d279a9