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