mako: partial update from JDQ39

Change-Id: If1f21dc37dd13eccefb843d063b15767b00cf713