Merge "Return a zero length byte from toByteArray instead of null." into gingerbread