mako hw branches

Change-Id: I1e9d00802f02f53140d7c2b5307d6a96203c00e6