Fix Mock Escaper not returning anything

Change-Id: I258d3dab155733641f8e4004d9ffed72a5caaf63
Merge "Fix Mock Escaper not returning anything"