Fixed comments. Added null-check in fromUTF8().
Merge branch 'Bug_997338_2' of github.com:kamituel/gaia into Bug_997338_2

Probably unnneeded.