WIP

Change-Id: I9556b0b92927622f90a82c49f8f32ad7a261c481
Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>