Change OSEHRAHelper to handle instance correctly

Change-Id: I857ea437364bf07c9e964e5132e4a60b78a62b83