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