Code review: 188420043:  Changes for deployments.