[#179348876](https://www.pivotaltracker.com/story/show/179348876)

Co-authored-by: Andrew Garner <garnera@vmware.com>
Co-authored-by: Colin Shield <cshield@vmware.com>