Change-Id: Ic663de04287d0cf963de71c3c18b43ed71f8139f Signed-off-by: Ziming Zhang <zziming@vmware.com>