Merge "Fixed CID 1038526." into tizen