Merge "[MS83.2] Make some APIs module-lib instead of system current" into tm-dev