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

Change-Id: I6cbff7452105b75d6b6edb35e7c156b9af45e0f3