Merge "API changes for addressing API Council comments." into tm-dev