Move type definition to common repository am: f123c2b5b5 am: f624baced0 am: 3f3b0681d7 am: 75c0a6a377

Change-Id: Ia8c2941373222f5051fbf03420bcb338a16543ae