mako: update from jwr66y

Change-Id: Ifc2687389e87dcd659d6e2df4e33ed41fb6b0d5f