Merge "Move type definition to common repository am: f123c2b5b5 am: 27c364ef06" into rvc-d1-dev-plus-aosp am: 6217de0db4

Change-Id: I985c968f2e80a5edf6cf16fd30ef83aa18b498bd