Track OPENSEMC changes

Change-Id: I460cfdf2a1d5892cc40cdca9a5a639e75c6845b4