Merge "Allow for internal types in @hide API" into tm-dev