I'm guessing that this is what was meant. Though hstr2ksstr and kstr2hstr still don't match, and I'm assuming they are supposed to be mirror images of each other. Change-Id: I0fccd086e16c043324af43a5c999c2fde7cf7505