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