Change order of inheritance

Change-Id: Ib4768dd7e7c340b20ea9f1a9a4aa1bb0457077b2
Merge "Change order of inheritance" into kk