Add missing implements UnEscaper

Change-Id: Ibf2a2b0e7b94cb5e4fa25e72d69aa503031a047f
Merge "Add missing implements UnEscaper"