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