Merge "Update system-current.txt to resolve API council comments" into tm-dev