[#171468485]

Co-authored-by: Timothy Hitchener <thitchener@pivotal.io>
Co-authored-by: Daniel Mikusa <dmikusa@pivotal.io>