Merge "Fix Gson serialization escaping HTML characters issue and lint problems." into tm-dev