Merge "Change osAppId from String to byte[] to match specs." into sc-dev