(cherry picked from commit cd825c5e5172e00107f973265a7ab4e354e71e14)
Signed-off-by: Matt Moyer <moyerm@vmware.com>
Signed-off-by: Monis Khan <mok@vmware.com>