Shamu: fix inheritence

Change-Id: Ifc2ff38e0f0ee601439a54dcb1fa8f2f609ad663