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

Change-Id: I7f5a75f4f6de96ec05795b97c1449234b6781a12