Latest Opensemc changes

Change-Id: Ibf6fd58e23b17f713e99a7f6eca6c42e0aceb1b7