Bug: 6363029 Change-Id: I71a1ed5b88f54fcc15bfaf89d3645b8f17ebb821
This change also refactor StringUtils class Change-Id: Ie0b4d169b21c260bf238d6fcc9ab0ee8bfd6b508