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

Change-Id: If979a9bd2bfb2a4f48e56aec44da14d2a7751e15