Merge "Disable updatable system manifest for T" into tm-dev