Move type definition to common repository am: f123c2b5b5 am: f624baced0 am: 542d3ff1fd am: 4fca8543ae am: 3017f19b9a

Change-Id: I50119fc31f9ffc5123b90b47ddedfbcaaf64657b