Merge "Don't use framework and SDK at the same time" into tm-dev