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