Possible fix Mako build≈

Change-Id: Ib9f666e6e3476bfe9ef7fb313af04c158156b79f
Merge "Possible fix Mako build≈" into jb43