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

Change-Id: I6f69ac4b8571f103fa8a6ec546b1fa4079a5507e