Change-Id: I82c697726e3689cf34c5378dc122e018d3603401 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>