Merge "Add owner for locale service." into tm-dev