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

Change-Id: I917af44e918d70c8cc41ff2a1a014f305cbeb26c