Merge "TIAF: Change on API Review: First round API council questions" into tm-dev