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

Change-Id: I6387b091630c560d23091cc1867591569fdda858