Merge "Fix unit tests to run on Android R" into sc-dev