BUG 1130 STRING_DEFAULT_CODEC - deserialize can return null

Change-Id: I797fb2849a6997f1b5af7098442b324bf3701d89
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Merge "BUG 1130 STRING_DEFAULT_CODEC - deserialize can return null"