Move type definition to common repository am: f123c2b5b5

Change-Id: I447d7d997185d939f82275c2d832bac6e7f93e39