Change-Id: I04ac2c53415cf678f2a503aad30b9f31624008ce Signed-off-by: Daniel Leung <daniel.leung@intel.com>