Merge change 7482

     * @throws IllegalArgumentException if the byte array has an odd length

     */

    public static String convertToUnicode(byte[] b, boolean includesNull) {

        if (b == null) {

        if (b == null || b.length == 0) {

            return null;

        }

        int arrayLength = b.length;