Updated the mako thread

Change-Id: I3517606e7e9276543dc53160eba2163337582dcd