Merge "[automerger skipped] Merge "API: Make implicit APIs from type usage explicit" am: 6fc3189e37 am: 1f12c3112d am: 739fbee3cb  -s ours"