Merge "Modify Unit test to pass on R device" into sc-dev