Merge mako into default

Change-Id: I13c40be80cc8e6fad997e52b557072a0711d69e3