Merge "[AWARE] Create true translations between legacy and hidl enums" into oc-dev