Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit e6ee4b49c48ec7c2e7df2cff7b253b01e88e7101)