Merge "[automerger skipped] Merge "API: Make implicit APIs from type usage explicit" am: 6fc3189e am: 1f12c311 am: 739fbee3 -s ours"