Update from upstream

Unbreaks escaping.

Change-Id: If7774237ba7993f366c6999c9fcefcd56d9221d2
Merge "Update from upstream"