mixin fixup

Change-Id: Ie927abb2aaa6b7505a8df507ca7afe1b59163296